Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 11 May 2010 06:12:46 +0000 (06:12 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 11 May 2010 06:12:46 +0000 (06:12 +0000)

Trivial merge